# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.15.52 -> 1.1046.15.53 # kernel/fork.c 1.118.1.2 -> 1.118.1.3 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/06/04 sam@mars.ravnborg.org 1.1046.214.4 # kbuild: Utilise kbuild infrastructure for vsyscall # # Added bonus: # 1) Check for changed cammandlines performed # 2) Nice output with make V=0 # -------------------------------------------- # 03/06/04 davidm@tiger.hpl.hp.com 1.1046.15.53 # fork.c: # Move task_cache back to its original place. # -------------------------------------------- # diff -Nru a/kernel/fork.c b/kernel/fork.c --- a/kernel/fork.c Mon Sep 22 13:00:08 2003 +++ b/kernel/fork.c Mon Sep 22 13:00:08 2003 @@ -53,6 +53,13 @@ rwlock_t tasklist_lock __cacheline_aligned = RW_LOCK_UNLOCKED; /* outer */ +/* + * A per-CPU task cache - this relies on the fact that + * the very last portion of sys_exit() is executed with + * preemption turned off. + */ +static task_t *task_cache[NR_CPUS] __cacheline_aligned; + int nr_processes(void) { int cpu; @@ -70,13 +77,6 @@ # define free_task_struct(tsk) kmem_cache_free(task_struct_cachep, (tsk)) static kmem_cache_t *task_struct_cachep; #endif - -/* - * A per-CPU task cache - this relies on the fact that - * the very last portion of sys_exit() is executed with - * preemption turned off. - */ -static task_t *task_cache[NR_CPUS] __cacheline_aligned; static void free_task(struct task_struct *tsk) {